libcxxabi-fix-link-builtins

if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library
flags, otherwise add libgcc following how libunwind does the same

Gbp-Pq: Topic libcxx
Gbp-Pq: Name libcxxabi-fix-link-builtins.diff

diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index 0675577aed6a1551c2952ccddc592cd2f16230f9..268c66360f4bad743f96157174dd49356a89a1d3 100644 (file)
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -81,7 +81,9 @@ if (FUCHSIA)
     add_link_flags("-Wl,--push-state,--as-needed,-lzircon,--pop-state")
 endif()
 
-if (NOT LIBCXXABI_USE_COMPILER_RT)
+if (LIBCXXABI_USE_COMPILER_RT)
+  add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}")
+else()
   add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc)
 endif()
 if (NOT LIBCXXABI_USE_LLVM_UNWINDER)